82. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2022-11-18 03:12:08 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

82.1 Files compared

#	Location	File	Last Modified
1	Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/email	invoice_new.html	2016-06-21 09:41:00 +0000
2	Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/email	invoice_new.html	2022-11-02 03:34:34 +0000

82.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	11	144
Changed	9	30
Inserted	1	4
Removed	0	0

82.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

82.4 Active regular expressions

No regular expressions were active.

82.5 Comparison detail

1	<!--	1	<!--
2	/**	2	/**
3	* Copyright © 2016 Magento . All rights reserved.	3	* Copyright © Magento, Inc. All rights reserved.
4	* See COPYING.txt for license details.	4	* See COPYING.txt for license details.
5	*/	5	*/
6	-->	6	-->
7	<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.getFrontendName()}} @-->	7	<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
8	<!--@vars {	8	<!--@vars {
9	"var formattedBillingAddress\|raw":"Billing Address",	9	"var formattedBillingAddress\|raw":"Billing Address",
10	"var this.getUrl($store, 'customer/account/' )":"Customer Account URL",	10	"var this.getUrl($store, 'customer/account/',[_nosid:1])":"Customer Account URL",
11	"var order.getCustomerName()":"Customer Name",	11	"var order_data.customer_name":"Customer Name",
12	"var comment ":"Invoice Comment",	12	"var comment\|escape\|nl2br":"Invoice Comment",
13	"var invoice.increment_id":"Invoice Id",	13	"var invoice.increment_id":"Invoice Id",
14	"layout area=\"frontend\" handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",	14	"layout area=\"frontend\" handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
15	"var order.increment_id":"Order Id",	15	"var order.increment_id":"Order Id",
16	"var payment_html\|raw":"Payment Details",	16	"var payment_html\|raw":"Payment Details",
17	"var formattedShippingAddress\|raw":"Shipping Address",	17	"var formattedShippingAddress\|raw":"Shipping Address",
18	"var order.shipping_description":"Shipping Description",	18	"var order.shipping_description":"Shipping Description",
19	"var order.getShippingDescription()":"Shipping Description"	19	"var store.frontend_name":"Store Frontend Name",
		20	"var store_phone":"Store Phone",
		21	"var store_email":"Store Email",
		22	"var store_hours":"Store Hours",
		23	"var invoice": "Invoice",
		24	"var order": "Order",
		25	"var order_id": "Order DB Id",
		26	"var invoice_id": "Invoice DB Id",
		27	"var order_data.is_not_virtual": "Order Type"
20	} @-->	28	} @-->
21	{{template config_path="design/email/header_template"}}	29	{{template config_path="design/email/header_template"}}
22		30
23	<table>	31	<table>
24	<tr class="email-intro">	32	<tr class="email-intro">
25	<td>	33	<td>
26	<p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>	34	<p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
27	<p>	35	<p>
28	{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}	36	{{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
29	{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) \|raw}}	37	{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) \|raw}}
		38	{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email \|raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone \|raw}}{{/depend}}.
		39	{{depend store_hours}}
		40	{{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours \|raw}}
		41	{{/depend}}
30	</p>	42	</p>
31	<p>	43	<p>
32	{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email \|raw}}	44	{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email \|raw}}
33	</p>	45	</p>
34	</td>	46	</td>
35	</tr>	47	</tr>
36	<tr class="email-summary">	48	<tr class="email-summary">
37	<td>	49	<td>
38	<h1>{{trans "Your Invoice #%invoice_id for Order #%order_id" invoice_id=$invoice.increment_id order_id=$order.increment_id}}</h1>	50	<h1>{{trans "Your Invoice #%invoice_id for Order #%order_id" invoice_id=$invoice.increment_id order_id=$order.increment_id}}</h1>
39	</td>	51	</td>
40	</tr>	52	</tr>
41	<tr class="email-information">	53	<tr class="email-information">
42	<td>	54	<td>
43	{{depend comment}}	55	{{depend comment}}
44	<table class="message-info">	56	<table class="message-info">
45	<tr>	57	<tr>
46	<td>	58	<td>
47	{{var comment\|escape\|nl2br}}	59	{{var comment\|escape\|nl2br}}
48	</td>	60	</td>
49	</tr>	61	</tr>
50	</table>	62	</table>
51	{{/depend}}	63	{{/depend}}
52	<table class="order-details">	64	<table class="order-details">
53	<tr>	65	<tr>
54	<td class="address-details">	66	<td class="address-details">
55	<h3>{{trans "Billing Info"}}</h3>	67	<h3>{{trans "Billing Info"}}</h3>
56	<p>{{var formattedBillingAddress\|raw}}</p>	68	<p>{{var formattedBillingAddress\|raw}}</p>
57	</td>	69	</td>
58	{{depend order.getIsNotVirtual()}}	70	{{depend order_data.is_not_virtual}}
59	<td class="address-details">	71	<td class="address-details">
60	<h3>{{trans "Shipping Info"}}</h3>	72	<h3>{{trans "Shipping Info"}}</h3>
61	<p>{{var formattedShippingAddress\|raw}}</p>	73	<p>{{var formattedShippingAddress\|raw}}</p>
62	</td>	74	</td>
63	{{/depend}}	75	{{/depend}}
64	</tr>	76	</tr>
65	<tr>	77	<tr>
66	<td class="method-info">	78	<td class="method-info">
67	<h3>{{trans "Payment Method"}}</h3>	79	<h3>{{trans "Payment Method"}}</h3>
68	{{var payment_html\|raw}}	80	{{var payment_html\|raw}}
69	</td>	81	</td>
70	{{depend order.getIsNotVirtual()}}	82	{{depend order_data.is_not_virtual}}
71	<td class="method-info">	83	<td class="method-info">
72	<h3>{{trans "Shipping Method"}}</h3>	84	<h3>{{trans "Shipping Method"}}</h3>
73	<p>{{var order.getShippingDescription()}}</p>	85	<p>{{var order.shipping_description}}</p>
74	</td>	86	</td>
75	{{/depend}}	87	{{/depend}}
76	</tr>	88	</tr>
77	</table>	89	</table>
78	{{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}}	90	{{layout area="frontend" handle="sales_email_order_invoice_items" invoice_id=$invoice_id order_id=$order_id}}
79	</td>	91	</td>
80	</tr>	92	</tr>
81	</table>	93	</table>
82		94
83	{{template config_path="design/email/footer_template"}}	95	{{template config_path="design/email/footer_template"}}